[IA64] fix merge error with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 25 Jul 2006 18:39:01 +0000 (12:39 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 25 Jul 2006 18:39:01 +0000 (12:39 -0600)
commit767a6a16798956c8d27270ea494ec2226d6b79fc
tree2c8ce2b12838b7d56923f0429321b9554558f54f
parent31423d8a91525f83f501a61b9b259420fc026cb8
[IA64] fix merge error with xen-unstable.hg

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
tools/libxc/Makefile